From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 27 Aug 2012 19:57:54 +0000 (-0300)
Subject: main: Load extensions as late as possible
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6036
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=df3fa973ad7913664ca8456028d869b01a13e64e;p=gnome-shell.git

main: Load extensions as late as possible

Since we want extensions to be able to be loaded at any time, that
means that the startup case should be as close to the live-time
install case.

https://bugzilla.gnome.org/show_bug.cgi?id=682822
---

diff --git a/js/ui/main.js b/js/ui/main.js
index adfaae2e4..73112f33b 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -233,11 +233,6 @@ function start() {
         global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
                                                 false, -1, 1);
 
-    if (sessionMode.allowExtensions) {
-        ExtensionDownloader.init();
-        ExtensionSystem.loadExtensions();
-    }
-
     if (sessionMode.hasRunDialog) {
         Meta.keybindings_set_custom_handler('panel-run-dialog', function() {
            getRunDialog().open();
@@ -286,6 +281,11 @@ function start() {
     global.screen.connect('restacked', _windowsRestacked);
 
     _nWorkspacesChanged();
+
+    if (sessionMode.allowExtensions) {
+        ExtensionDownloader.init();
+        ExtensionSystem.loadExtensions();
+    }
 }
 
 let _workspaces = [];